Merge update from ...oppo-source:master