Merge "In ShortcutService, save data of each package in a separate file" into...
Merge "In ShortcutService, save data of each package in a separate file" into rvc-dev am: bc62377b am: 930e61f4 am: dd2081b5
Change-Id: Ib1558357852c3d976bfdb3e36cb3aed8ab113efb