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

Change-Id: Ifd7bece750bc4b218dc94b86550b544a0c68c143