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

Change-Id: Ief0190897ea7dd12ad0b1ac12111eb78286f5491