Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 3c5bb65710  -s ours
am: 89cb430eed

Change-Id: I8550c23fcffb7183524df3f85aad7fa1819124a6