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

Change-Id: Ib66658d36249d717dd857789a047d1b391778f90