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

Change-Id: I2f6f5a1a9bd7d7cfec92539c7a8cc2f9b5185683