OPPO-Source updates

Change-Id: I23ba9c2498c2655ca7526d1666f31a1cd6ef4358