Merge remote-tracking branch 'origin/sm7225_s_fp4_target_dev' into kernel/12/fp4

Change-Id: I0883555a649c0959ced10dfc9652cdb745fe6477