Fix merge derps

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