Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 4ae4b9c66f  -s ours am: fed4769bc3
am: cd5b7a65b7  -s ours

Change-Id: I671a147209bd5c6040ba78c86257b99e2d1a15a4