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

Change-Id: I1ea99297879174cd2b91f05408d765e705c612d4