Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: cbc75fa643  -s ours
am: 7f71a70fd9  -s ours

Change-Id: I9f05351ed2accaa83b18bb425a268fad4adab49a