Merge "Merge "Merge changes I8a3bfd97,I363fa70b,Ie53e3314 into nougat-mr1-cts-dev am: 2516c859de" into oreo-cts-dev am: 0f6153fc97 am: d25bbb0969 am: 18e31b584d am: 664c76c90e" into pi-dev