Merge commit '1193ae4e824c66b75083c444ce0f250594e138ee' into eclair-plus-aosp * commit '1193ae4e824c66b75083c444ce0f250594e138ee': Backport l53e91db7 from master.
Merge commit '1193ae4e824c66b75083c444ce0f250594e138ee' into eclair-plus-aosp * commit '1193ae4e824c66b75083c444ce0f250594e138ee': Backport l53e91db7 from master.