Merge AU_LINUX_ANDROID_LA.BF64.1.2.2_RB4.06.00.01.180.049 on remote branch

Change-Id: I3a69c1cd810440a4b7abaa0fa3e5525d62508392