am b936c57c: (-s ours) am a730881d: Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev

* commit 'b936c57c2cda994cee20a72ee2b668629996a229':
  DO NOT MERGE : Fix measuring with outset for orientation