Squash changes for 4.3

4.3

4.3

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