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

Change-Id: Id29f5fc7f1ee237572ace1156f5be58a0e4520e3