Merge AU_LINUX_ANDROID_LA.BR.1.3.2_RB3.05.01.01.156.017 on remote branch

Change-Id: I8ad8a722bb667715cfb13f4927c00efeeec1d436