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

Change-Id: If46370ba2dd0ca62a8adde4bd793c0342cc05573