[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52

Change-Id: I27f46c383d9ca5760aa4d15ff6823626ca3e0a92
tree: 60d198c6bc42d67433853e97c225e2af7a0ad4bc
  1. tests/