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

Change-Id: Ib8765dd8e7321364c7e8026c1ab943445e3a88da