Merge commit '2a9d42a651ef444f32f0a6e60711bb2c371d3fce' from nougat-cts-mr1-dev to...