f9435d7521
Merge commit 'f7c886b4fe27cd9ab4a9991958ff931054556a24' * commit 'f7c886b4fe27cd9ab4a9991958ff931054556a24': Respect android:allowClearUserData=false during restore