am b7288e7f: am 587e2ec6: Merge "Fix build."

* commit 'b7288e7f577057821a1181f3121dc1f20209b1b7':
  Fix build.