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

Change-Id: I4cc7a8f34ed714c03d1c186c90575cc82ce39630