Merge "Persistent storage in Carrier Config debug shell commands"