Inject oppo r819 changes - still a WIP oppo r819 is not supported yet