DO NOT MERGE: Merge Oreo MR1 into master
am: e5aba25c43  -s ours

Change-Id: Ie0de0e25eb8c6cb1cfbf39b8576854727bc59df3