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 am: 78feed91
Change-Id: I5076f788392fd95bc4e51348a0d2f26787f7329c