Merge "Distinguish shortcut vs non shortcut convos" into rvc-dev am: a3460d1831 am: d48ac781fe am: 559cc697c7 am: 58e14d009c am: e5a972a378
Change-Id: I8a34247ef143d963e8a3b96ccf109743577004a1
This commit is contained in: