Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.009 on remote branch

Change-Id: Ie6fae05e251317910335ff9a62686293fa82e17a