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

Change-Id: Ib79f8a690859b8fa6cc3d3a06cccf3d2d33e9ee4
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/