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

Change-Id: I765ebbae03561864cbdc2624cddfa4ecd4c4084f