Merge "Fix [kv-4] PerformBackupTask possible NPE/Wrong package report." into pi-dev
am: b30a1b0668

Change-Id: If6b49d2087a1b007a0befa6b9820cf9d5957eb29