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

Change-Id: I236d1d07ed5e5bd03cb7948ee17f34d1048e523f