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

Change-Id: I300d219c7f2df7618e2bb1cc28c395985925fe1e