Code Freeze

Change-Id: I3357b8d98999efb33ce37a02cbeba16167921d02
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Not yet

Revert "Code Freeze"

This reverts commit 015a5d7d717b4b26b32f501f191f41f6ecdc58d1.

Change-Id: I183f4b9c9d4b15a6dc8f4a851d0f31ba921d0e3d
merge changes from Slim kk4.4 into local branch