Merge commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-plus-aosp * commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9': Backport the change I30b141a2 from MR2 to MR1. Do not merge.
Merge commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-plus-aosp * commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9': Backport the change I30b141a2 from MR2 to MR1. Do not merge.