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

Change-Id: Ie71c6edf3812d94f7a515ad0dadba4cc85b7aec9