Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 6e9db34e73  -s ours
am: 0dedc7e41f

Change-Id: I78ac7406d97accf15e1f76156f7530fcdf106ee8