Merge "Distinguish shortcut vs non shortcut convos" into rvc-dev am: a3460d1831 am: 2327a3b62a am: 11dba39118
Change-Id: I006ccd39ef7077306696b67f07b562692706ae6a
This commit is contained in: