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

Change-Id: Ie75c99c9d2a4b007c4be935baaebb6b94a8a2ad2