* stable-3.1: Restore existing Base64 transcoder for private key Remove unused annotation @ChangeUpdateExecutor Change-Id: I55f0668b1131b945ae3c7325a9b6b27b3ad9b51c
* stable-3.1: Restore existing Base64 transcoder for private key Remove unused annotation @ChangeUpdateExecutor Change-Id: I55f0668b1131b945ae3c7325a9b6b27b3ad9b51c