am 479b1c77: am 037c9cac: Merge "Fix build." into cw-d-mr1-dev

* commit '479b1c77ce7b033f7160614f5a0d7305d1268129':
  Fix build.