[automerger] Merge changes from topic "am-ce0b82716046454cb0a4f10e2fc1d036" into nougat-mr1-cts-dev am: 5962c9a234 am: b4bfd2591e

Change-Id: I120eb44d9d2d125a39e126cb352c647957f7c3d6
tree: ecb1d417d3c7d2716b03ed5e7600972b0c46b7b8
  1. tests/