More optimizations

Change-Id: I81ac2ec92b31802faa8f0d116f3d230c48bf9e96
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Merge "More optimizations" into kk4.4