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

Change-Id: I34026382746bc60a26fc3a40680c12fa2e2e3fe9