am 937223d4: am 582393a1: Merge "Fixing build and continuing refactor" into klp-dev

* commit '937223d4a008030e7b04d02daf4ffcc6bf4ff2fd':
  Fixing build and continuing refactor