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: 737e0c32 am: bcf623b8 am: f1757db4
Change-Id: I2968b2bc414ffee99526a31c943d71fed8f72047