Merge "Fix android:allowClearUserData." into gingerbread