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

Change-Id: Icf2f0420ee80be51d2171425876c77852ec271f6