Merge "Merge "Merge changes I6d8ecdfc,Iff0b0c7e into nougat-cts-dev am: 315a0f0150" into nougat-mr1-cts-dev am: 4cc95d60cb" into oreo-cts-dev
am: b4f9b0de21

Change-Id: I0a89cfd90641992d2b40f6517862f8918b12ef89