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