am 4f4ddd5f: Merge "Try normal allocation if large object allocation fails" into lmp-mr1-dev

* commit '4f4ddd5fe83ad7e070ad72a0513b2863a511511e':
  Try normal allocation if large object allocation fails