Merge "Fix build broken by cad8269d45f5478b2a9."
am: b53880e298

* commit 'b53880e2981b04dc33ef2833448597d9b5a20050':
  Fix build broken by cad8269d45f5478b2a9.