Merge commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b' into eclair-mr2-plus-aosp * commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b': Fix test breakage in testNickNameV21().
Merge commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b' into eclair-mr2-plus-aosp * commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b': Fix test breakage in testNickNameV21().