Merge remote-tracking branch 'origin/sm7225_r_fp4' into fp4-r-rebase

Change-Id: I35de154f3ba4cea90abf6c4db612c94ce19f558c