Revert "Squashed commits from OPPO Source updates"

This reverts commit ac3d96fb278dd0633c2e15f448666b1efae09b71.