Merge "Allow restore of settings with nullable components" into pi-dev
am: 2d6dbbac04

Change-Id: I28f02ff934aed4e51395c6c1692f655cf35bbbed