misc: Update from Oppo release svn9954

Change-Id: Idc1a30e63ee548197bddf6886856e9a02bdfee39
(cherry picked from commit c928a4a9df58ea98519a692004c3dd7974101ce6)