Merge "Fix memory leak in ResTable" into lmp-dev