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

Change-Id: Ic7d758bb937ee64e1429a3576bd069e70f1b889e