Merge changes from topic "am-88b556e382664762826e9919f3a4396d" into oreo-cts-dev

* changes:
  Merge changes from topic "n1" into nougat-mr1-cts-dev am: d0b3e601e8
  DO NOT MERGE: Test for bug 69478425 am: a2b706da29  -s ours