Find 7: fix OPPO-source mismerge

Change-Id: I9da0ca5773c9a9840d8a478215692c84410defe2