Merge "Adds test to verify cached shortcuts don't count against the limit"...
Merge "Adds test to verify cached shortcuts don't count against the limit" into rvc-dev am: e0fb2c72 am: 34888420 am: 23ac591f am: 6c35fe03
Change-Id: I25805313364b6f3e5d602e05bd9a8f0f91935a49