Merge "Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev." into nougat-mr1-cts-dev
am: 510a2eff8f

Change-Id: I2b6ec560560e250a0ea6309238b55475aa2e139b