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

Change-Id: Ifbfe84e38788a14bb1af089f6fbceadffc1d6c46