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

Change-Id: I41539520356b56b8f5bf5f40d53d69225cbcab7f