Merge "Notify on restore" into pi-dev
am: 5ddbe7a280  -s ours

Change-Id: Ic96924701d6ee4a514d1249fcbb5de47fceaef12