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

Change-Id: I31e23588786ea5dff19f907a7280e8bb7cdccb56