DO NOT MERGE: Merge Oreo MR1 into master am: 777f94aede  -s ours
am: ae4316c668

Change-Id: I3124f789e5b22ff121886ee3b8de21b8e65a7378