Merge with CAF LA.AF.1.1_rb1.6

Signed-off-by: Paul <javelinanddart@gmail.com>