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

Change-Id: Ic0570155bba210a0bffa2e813724cbd13225dddc