Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from
authorXin Li <delphij@google.com>
Thu, 26 Jan 2017 18:28:31 +0000 (10:28 -0800)
committerXin Li <delphij@google.com>
Thu, 26 Jan 2017 18:28:44 +0000 (10:28 -0800)
commit04974c3449624fc46f06d145cfbc84783ac58342
tree4683f4cc440ad2be9e7a58569ecd40a913f5b266
parent54c090f9819c59cd36613517712cbfd44eed376a
parent2a9d42a651ef444f32f0a6e60711bb2c371d3fce
Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from
nougat-cts-mr1-dev to master.

Change-Id: I9ad6799aaae603a05c0cc65bcff60df8bff88a95