Merge "Notify on restore" am: a38769ce7d
am: 450a424865

Change-Id: I025c5643980f9dbbba7448c9c0f44e2daddfbef9