Merge "Persistent storage in Carrier Config debug shell commands"
am: 04009127f2

Change-Id: If6621845ee8159a2323a6116ca22b806e72bb360