Weekly 6.2

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