Merge "Notify on restore"
am: a38769ce7d

Change-Id: I34a884893fe230b9ee1418ee6102385181d22488