DO NOT MERGE: Merge Oreo MR1 into master
am: 78475cdcf6  -s ours

Change-Id: Ie8da00c1662987f5cb91d17eaa684c7e7d7740f8