Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.012 on remote branch

Change-Id: I1690cee869b01821dbf5c75aed4806ea15d525b1