Merge AU_LINUX_ANDROID_LA.BR.1.3.7_RB1.08.00.00.336.035 on remote branch

Change-Id: Iea42aa031284d2c4f11ac53574e155e45e044554