Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 6c7096864b  -s ours am: cfbc9c1224
am: f568c95652  -s ours

Change-Id: I14c433a4f60a44400cef8e30d215d8a3bd318221