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

Change-Id: I3cd568482bf83a57cf02d827afea0005ee6a775e