Merge "Allow to provide only a component name prefix to \'am instrument\'" into nyc-dev am: 7a276116
am: 537c8bdf
* commit '537c8bdf':
Allow to provide only a component name prefix to 'am instrument'
Change-Id: Ie214689851107f6b72da7b60fd27226572adad9d