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

Change-Id: I87e64073cb0408afea7e383f1bfdbcf4109b1086