Merge "Optionally tag classes with Maven artifact spec" into oc-mr1-dev
am: 8ea43aab82

Change-Id: I63d07c5b394be51d2b7a82a20283d45765019b3e