am c95775b5: am 6cad2550: Merge "OwnerInfos code cleaning" into lmp-dev

* commit 'c95775b543366e36e652c7d5f04e5b21121053f9':
  OwnerInfos code cleaning