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
Change-Id: Ie3558f4b16c081d56b088ddf046f8b5b03f47afc