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

Change-Id: I77bfeeb76d21179afc7eeb972a8a77109bcea010