push to 1.3

Change-Id: I04b417937c3d5e43329f06cb3fac997264fe8ac8
push to 1.4

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