Squash merge cm-10.2 oct 8, 2013 20:06

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