am c56a9d10: am be36ebc2: Merge "Add convenience method for getting the...
am c56a9d10: am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev automerge: 38d6cf9c
* commit 'c56a9d10':
Add convenience method for getting the complex unit type