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

Change-Id: I89e2f857b03d93b3746bf2a4237c0b60b4fce93f