OSDN Git Service

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