Lets Freeze for 6!

Change-Id: Ifc67d4113827a9e02a0d0612c7b08116e955faac
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
merge changes from Slim kk4.4 into local branch