OSDN Git Service

Merge cherrypicks of [5141855] into oc-m8-release