Merge remote-tracking branch 'caf/LA.HB.1.3.1' into HEAD

Change-Id: I36c24ad497c112a2f0144a013fe4d8a68b999818