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

Change-Id: I32bae791f9759b30ba6416e56a8d60694eac6f9b
tree: 80ca5489f3519d96804a56addbea9ee72ff5ec88
  1. tests/