DO NOT MERGE: Merge Oreo MR1 into master
am: bb80b0f386  -s ours

Change-Id: I34afb9bd06de67c716e49100c912c8f3d43c9cff