Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: c3c1ae81aa  -s ours
am: a18b19b39c

Change-Id: Ie0b20b1d369a268d271bb69b8eafe798f8e42640