Merge "Save KeyChainSnapshots to disk" into pi-dev am: 02c0bbdc47
am: 0eb805463a

Change-Id: I9c922b94701eee213646a6ca3a2c4488959e5ce1