Merge changes from topic "am-d7a8d38cb5464f2ab34410afe6f2d84a" into oreo-cts-dev

* changes:
  Merge changes from topic "am-4460289d73cc4a17b383336a6eb810a7" into nougat-mr1-cts-dev am: d9a432df35
  DO NOT MERGE Add test for bug 62187433 am: ae96c0dee0  -s ours am: 76ecc59e11  -s ours