Merge remote-tracking branch 'caf/LA.AF.1.1_rb1.7' into cm-12.0