am: 8295332d83 * commit '8295332d83d1e664a7ef3a731370ae71242688a1': ShortcutManager: API changes for DR Change-Id: I0006667d4bbe2fa92015ac442ae1e8362cbcacbd
8295332d83
9a32929def