Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4 am: a463421450 am: 983bd08331
am: 178f67f69d

Change-Id: Ifb2144f66596e22fc1a985815b98b63e16ce212c
tree: f053791b2ab65c58895d16b53dad660248e0a11b
  1. tests/