Merge "DO NOT MERGE Add notification settings to backup&restore" into pi-dev
am: 1f3c8278e8

Change-Id: I505fb77cea4e861acea138c8661d535b752afae9