am 0e00a2a2: Merge "Fix tests." into ics-mr1

* commit '0e00a2a2fd6f6b566a56cd94c93ddc2945360ac6':
  Fix tests.