Merge "Skip empty slice permissions files during backup" into pi-dev
am: 6024de3b89

Change-Id: I3ae49f47a943819447abf5ad27d9b383c7dba8c3