Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
am: bc18e7e105

Change-Id: I383d04d335a27c522758b7838f124333822c5e02
tree: 437a5c2b9bb14a7ffac6c80b297d67d10065ee21
  1. tests/