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

Change-Id: Id7262f5d2de36dda0c6254891408c0d47c56cd94