OPPO-Source updates

Change-Id: I4fd653c68acad2acba3e4eb86c45540eaf37e373