[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444

Change-Id: If9bc5987bc69873e2e83f2f09e69c9717c87d92b
tree: 3cfc405f22847ea44743da0c9a343404ecde7883
  1. tests/