Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev am: 36407c961d am: 299f737297
am: 438c8d87ba

Change-Id: Icc8789dc727b8a2f6ad71a1b6b71703351145f12
tree: e5f80f1c4246d14fb520cb677b261d5e47acc301
  1. tests/