Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996
am: ce2230abfd

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