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

Change-Id: I1ff3b3086d7890ed1691cdd2821c76680fd152c4
tree: 3cfc405f22847ea44743da0c9a343404ecde7883
  1. tests/