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

Change-Id: I1ea99297879174cd2b91f05408d765e705c612d4
tree: 35c8978ed2d99d22d57536ccbb4f85213d82667d
  1. tests/