Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 350f920753  -s ours am: edb2373362
am: 6ab6e15c95  -s ours

Change-Id: I9cd784500a3dfc6e3b40751840a95fda3a2ba632