push to 1.5

Change-Id: Iff57f4b176e8a92692a851d6e2ec7b6adf84bc1f
push to 1.6

Change-Id: I54b226ccfd7c0fcfcbab1786a122973ac29541f8
Merge remote-tracking branch 'Slim/kk4.4' into slim4.4