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

Change-Id: I0405304fb4438ba9127666814c4f3f86e456f8e9