Merge "Making the parseAndAddDeepShortcut api private." into tm-dev