Merge changes Id4e4a997,I523d727d,Ie842a567 into oreo-cts-dev am: 9f925e3128 am: 35185b1862 am: 61e955bd2f am: 4e8a973a55
am: 3268a089f7

Change-Id: Ifdcce3127b023d55c1549590e4322902f8740bba