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

Change-Id: I877489de77efc7474ac8eb60ed465bfac7ed783c