Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD am: 1eca62a8ce am: 5096a1b626 am: 7b59772553
am: f17d35fe42

Change-Id: I133309d1542dc0f3acb47737bcfda50b351a082c