Merge "Try normal allocation if large object allocation fails" into lmp-mr1-dev