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

Change-Id: I4c0b01839ada3cfe3d7c6e3a2242bf90ed153e59