am ae452bd4: am 47687a46: Merge "Build fix."

* commit 'ae452bd424ff4429b05d367752f7b2577d3df484':
  Build fix.