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

Change-Id: I74182a318e98057e68170aaec1e8d2b11dfc7444