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

Change-Id: I76dd6625df407d0c34e32c4d67117983dcd98f71