Official 8

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