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

Change-Id: I58dc009442b0b9718740030a45d8d7b26c47eb0f