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

Change-Id: I3998c1d48358f4299475aeca048ac8a62fca8eb5