Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE

Change-Id: I88e2887b0691ce3c5018578556abf7c420fe5a1b