Merge "Persist KeyChainSnapshot to XML" into pi-dev am: 9f75e089ed
am: d9b91fca26

Change-Id: I74aee2c0e1c7eda412a31f1bcd7cf2b13ac2190f