Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 64a43efc26  -s ours am: 0fe8f65ecd
am: 4565047b4a  -s ours

Change-Id: I9861e1414451d44fc5e7841249d9cfe69922ce9f