DO NOT MERGE: Merge Oreo MR1 into master am: 28469c5771  -s ours
am: 7db332aefa

Change-Id: I80e39e6a8c8ff0fc3277040439eeff872b800950