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

Change-Id: Iff2c9429b44a8a7d7455b08018d44b3753964c63