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

Change-Id: Ib1558357852c3d976bfdb3e36cb3aed8ab113efb