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

Change-Id: I4a72a2ad553c834ca01b004bfb81f91891f3c57e