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

Change-Id: I1f69d092aa0de7982df497930e991fd5775b377a