Merge "Merge changes Id4e4a997,I523d727d,Ie842a567 into oreo-cts-dev am: 9f925e3128"