Merged squash AOSP 4.3

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