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: 997185b1
Change-Id: Ic5769b8a5fedfdc62f5f35b3f27015e4294c2615