Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d59157b919 -s ours Change-Id: I6aebd4794fcdeb19bbe0911f4f05b85b6b753d29