Merge commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373' * commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373': android-2.1_r1 snapshot