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

Change-Id: I776bb7c0a7fbb3ee45d81bffbfe3f870da83e47a