Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
am: 8ef12d94da

Change-Id: I296d1bd01c211fb769e6a7da3d10bf8c91ffcb2d
tree: 27e41297f76178db974e7276857788fa47261bc6
  1. tests/