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

Change-Id: I1f349012d54f59d8ddf3e4188c8bcdd3c1da77dc