DO NOT MERGE: Merge Oreo MR1 into master am: e4026a6732  -s ours am: 930d43c8df
am: 82a256a7f5  -s ours

Change-Id: I98eb0898d8ac18ebabe3691e9ae297a60ce3a4be