am 17609db4: Merge "art: Fix bug in VariantMap::Set"

* commit '17609db47537ea6da03db1be530ad13e67cf24db':
  art: Fix bug in VariantMap::Set