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

Change-Id: I36b503f2d5cb0ea95f01ea840e74f1d87e41d14f