Merge "Merge commit 'AU_LINUX_ANDROID_JB_3.2.04.03.00.112.224' into HEAD"