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

Change-Id: I431be8102a171b2d79e08dad2ae42dbc73512894