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

Change-Id: Ib02217fd6d4741ff4273e28661658f6b25e2f687
tree: ecb1d417d3c7d2716b03ed5e7600972b0c46b7b8
  1. tests/