Merge changes from topic "am-98159cea374341acac57ad5a4ed38633" into oreo-cts-dev

* changes:
  Merge changes from topic "am-63874c1998a84a9aaa6cc188eb88fa57" into nougat-mr1-cts-dev am: 1c157082ca
  DO NOT MERGE: Test for bug 69478425 am: b4a4154558  -s ours am: 1ec1a39c8a  -s ours am: 2da232e96e  -s ours