misc: Update from Oppo release svn9954

Change-Id: Idc1a30e63ee548197bddf6886856e9a02bdfee39