Merge remote-tracking branch 'caf/LA.AF.1.1_rb1.18' into HEAD

Change-Id: I5ff7ee6a8875318a6bd8e9a7e3828f629c6a3d1c