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

Change-Id: Ie00e47b477e1c62853a98c368c9e2933aaf66698