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

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