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

Change-Id: I9c9963642fa1f5aff863b0c8ffd7789d8dcf86e2