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

Change-Id: Ib3ff1d7ce8f2359f2658185298b9e9fe4a8d0957