Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev am: af13eeb110
am: c5935d442d

Change-Id: I42cc114641755be42fb9c7269ae726f87e48f5a0