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

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