Merge remote-tracking branch 'caf/kk_2.7_rb1.21' into cm-11.0

Conflicts:
	net/wireless/reg.c

Change-Id: Ie543e81d9d67af8695a18212fecb95f12f3595e7