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

Change-Id: Ibce3961869297df9361a4d5f6c3df286ee587c15