Merge AU_LINUX_ANDROID_LA.BF.1.1.1_RB1.05.00.02.042.020 on remote branch

Change-Id: I2298868f037ca590750f42237e36d658ddceca01