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

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