Merge "Add the shared-storage backup component to the build" into ics-factoryrom