Merge AU_LINUX_ANDROID_LA.BF.1.1.1_RB1.05.01.00.042.025 on remote branch

Change-Id: I88eac3cc21549ff78b0c07e365ee7f499eb7a9ab