Revert "Revert "Merge remote-tracking branch 'origin/Oppo' into kk4.4""

This reverts commit 0f52ce6c77356651590d005076714f7550ffa19b.