[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606 am: 9289660d76 am: d89cacb7bf
am: 3977adb530

Change-Id: I85084738c6ac9155425bf5c723dd5956163c619b
tree: 80ca5489f3519d96804a56addbea9ee72ff5ec88
  1. tests/