Merge "Update default elevation values to spec" into lmp-mr1-ub-dev