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

Change-Id: Iafd862995f1944bb56c5829a10dc8b997f941d2c
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/