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

Change-Id: I928824447efd55a1426992b7c2443d5ac932f402
tree: b200fff2914576bdb3d59836b60e90f4adb0b12b
  1. tests/