Fix Google backup/restore

Change-Id: Idd5f63caf58742fc7a52d42e8e64731387983876