Merge "CTS verifier: "inline reply must reset shortcut manager rate-limiting"" into nyc-mr1-dev am: abc954d446
am: 0943877677

Change-Id: I0d6dc604cc58ff968dd98b0367b7ad179451a972