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

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