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 am: 6073843a
Change-Id: I82ba184b47ee15b39842e6655fe010981669c6d3