Merge "Remove warning for null entries in resource array." into lmp-dev