Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 98417af42c  -s ours

Change-Id: I53cc1fd727c53bcde32f1025e202390202988d88