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

Change-Id: Iacad0574bdee6f0ed2ac49bea73924b0472dec8b