am d19511a6: am c3a4cfe9: Merge "Support EMMA_INSTRUMENT in both full and...
am d19511a6: am c3a4cfe9: Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev
* commit 'd19511a6':
Support EMMA_INSTRUMENT in both full and unbundled builds.