am 176f13a7: am afd37c42: Merge "Build fix"

* commit '176f13a70845555d6b5776ddacdae8771dccb13f':
  Build fix