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

Change-Id: I45e3591111d0459cd1ff2be079ad525568da76f3