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

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