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

Change-Id: I38e24b9e21d23f9f6b112da75084a417fcfd9f46