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

Change-Id: I5604941fcba6cd5c861ed59968631cc6216f3dd7