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

Change-Id: I5076f788392fd95bc4e51348a0d2f26787f7329c