Merge "Merge commit 'fc575bca313624a7cba20171fbaa625bbc852cd4' into nougat-mr1-cts-dev" into nougat-mr1-cts-dev
am: 1c26d74db1

Change-Id: Id0373205ac68db983ca088d9677daabc0fa7969c