am 040e46c3: Merge "Fix artifactory snapshots"

* commit '040e46c3cc80de8eb21166f912e074a8b94c147f':
  Fix artifactory snapshots