Merge "Floor height API changes." into oc-dr1-dev