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

Change-Id: If316e2bf65b20cfee66fca82fe4c22b1fdb4f732