Merge "In ShortcutService, save data of each package in a separate file" into rvc-dev am: bc62377b95

Change-Id: I88d4a4bb4acbb0e348457e0ca95ab6781f70dc8c