am 7952c4cd: am bb5f014a: Merge "Use offset in line drawing" into jb-mr1-dev

* commit '7952c4cd99b0a75922b11a5df55bf8f7cf24030c':
  Use offset in line drawing