Merge fixup

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