am 8736f2d7: Merge "Fix oscillations on ICS"

* commit '8736f2d719940b18b931ad18b7b436ecbd28d222':
  Fix oscillations on ICS