Merge remote-tracking branch 'caf/LA.BF64.1.2.2_rb4.7' into HEAD

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