Merge remote-tracking branch 'caf/LA.BF.1.1_rb1.16' into lp

Change-Id: I9eafbde65b8d545faa96c93c39adf453f9d4aa9a