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: 16b74a12
Change-Id: Ibce3961869297df9361a4d5f6c3df286ee587c15