Reopen code 2.1

Change-Id: I92d49653b3fd75efa4c0f5cc7b15f60e939a2e58
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Merge remote-tracking branch 'upstream/jb4.3' into jb4.3