am 22c3512c: Merge "Eliminating aliasing vertical lines." into ics-mr0

* commit '22c3512c84d708f3ce21b3e0a42763b07c884d20':
  Eliminating aliasing vertical lines.