Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev
am: 36b9badd7a

Change-Id: I05ed05ee99fa59d9de6a50b84746b98fca7eefff
tree: 27e41297f76178db974e7276857788fa47261bc6
  1. tests/