Merge "Merge "Merge changes I18e4e806,Iddf4b82a into marshmallow-cts-dev am: 18dc88a5c3" into nougat-cts-dev am: 6e9fd4c005" into nougat-mr1-cts-dev
am: e3f3a8efcb

Change-Id: Id2e71651b6aef1e1f0fe329232516206ad4bd845