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: d73155fc am: 972ac54d am: 0bec9bea
Change-Id: I6418f8c5783e5f4473ddba8f5f58fac9789f23ee