am 64cb3ec4: am 26c2e5a0: am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev

* commit '64cb3ec43209e61a63b79a227cd00f848ef1bddb':
  Fix regression in RCC.editMetadata(false)