Merge "DO NOT MERGE Create a key value settings observer for backup parameters" into pi-dev am: d3b6e9fe22
am: 04e4a37fd4  -s ours

Change-Id: Ifa6de7d15f77d613f04344a08bf7da0ea1c03cac