am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev

* commit 'c7be69f1d63bcc8411875ff53e5561f2f4692072':
  Don't call size on a null metadata