am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev

* commit '7a60cdbd0989fdc262f7838b26c551a3417b7edb':
  Fix regression in RCC.editMetadata(false)