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

Change-Id: I289d9a7cbe18083228f8190778e7b33febefeeab