Merge remote-tracking branch 'caf/LA.BR.1.2.9_rb1.9' into cm-14.1

Change-Id: Ib709cf3ca7c5a0536675aaeb0e63a4cc1f51d1cf