Merge "Move digital_stroage.h to its own library" am: 101588127c am: a3320441ed
am: b7d260d2c7

Change-Id: Ic7ee2ef07182c793ff59648dfed493bb50ab7e37