DO NOT MERGE: Merge Oreo MR1 into master am: d1a6d1eb81  -s ours am: 73c7218dcc
am: 8df2008f36  -s ours

Change-Id: Ida37c68c7891df6964037d63251df42549135bf3