Merge "Fix build broken by cad8269d45f5478b2a9." am: b53880e298 am: 69b200cf29
am: afdfcaf806

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