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

Change-Id: I0b0eacbdffdfcd5ff63ef927c0c7d331944428f7