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

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