Update for weekly 8.18

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