am 08b52112: am e95f4986: Merge "Fix a build break." into ics-mr1

* commit '08b52112335dcbcd51fa387c2a9a92dc43efa689':
  Fix a build break.