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

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