Revert "Fix google backup/restore functionality"

This reverts commit dc2b13c3065750988b926270cd9ee8ea3a3207a3.

This actualy break google restore functionality.

Change-Id: I0befd88588176c4387b49e80299a311f3a5cf5aa
Merge "Revert "Fix google backup/restore functionality"" into kitkat