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

Change-Id: I845720eea2e308e886afd2c900f66bfdff24679d
tree: 59be354e010f9cf95aaa3d0cbbf9b1ff92fcacd6
  1. tests/