Merge \"Shortcut: Reset throttling upon inline reply\" into nyc-mr1-dev
am: 489bafbb4b

Change-Id: I5c8dc7f3c1e5860ea870d88b2ff7fc2a86a4ba39