Misc updates from OPPO Source