push to 1.95

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