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

Change-Id: I77042120e8a65485e99752d918384f971e7b3358