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

* commit 'e95f49869b02dd9792718fb1075241acdf6ca775':
  Fix a build break.