DO NOT MERGE: Merge Oreo MR1 into master am: 4e0c4861f9  -s ours
am: 3b441660e8

Change-Id: Ibaa570574d94d53a31c8f04447b5c658a5203899