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

Change-Id: I0414ec8ec489f9f4617b54d81277434d73526b30