Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: af30cfd60e  -s ours am: 14bfe7a7bd
am: 9eb9cd0e54  -s ours

Change-Id: I43fe840cb4d003c205efc724d686f0451f0fc35d