[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89

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