Merge "Temporarily turn on backup/restore debug logs" into gingerbread