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

Change-Id: Ie82301a1b7ae68c6af273e3ca45cf7e557045dce