Merge "Floor height API changes." into oc-dr1-dev am: 2717eaba05
am: 65b2b5dcfb

Change-Id: Ic99fee0ca1cd279aaff882eb1e414dc27a758987