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

Change-Id: Icab80887d9a2f2cb8efe9da889a7c6ddd2f41ba1
tree: ecb1d417d3c7d2716b03ed5e7600972b0c46b7b8
  1. tests/