Merge remote-tracking branch 'caf/kk_3.5_rb2.10' into kk4.4

Conflicts:
	drivers/power/qpnp-charger.c