Merge "In ShortcutService, save data of each package in a separate file" into rvc-dev am: bc62377b95 am: d73155fcbe am: 16b74a1296 am: 6073843af2

Change-Id: I82ba184b47ee15b39842e6655fe010981669c6d3