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

Change-Id: I603452c6ea44eec44d5c03fab4130034acc7d11d