Merge "Invoke service w/ action" into nyc-mr1-dev
am: b64095df86

Change-Id: I5b478e8caa00e72145715cf9625bc61deb9d3df3