DO NOT MERGE: Merge Oreo MR1 into master am: 220e17d0a2  -s ours
am: 0fbee238d1

Change-Id: Idd58e145ef7e02fb6d28d2d95a42a68eb3cee2fe