DO NOT MERGE: Merge Oreo MR1 into master am: 93426dc70b  -s ours
am: ac52218be5

Change-Id: Ia8d8579173a881d7b352e30011a79edb6f7b1d57