am 70c81f60: am e7ac37e7: Update to follow internal impl.

* commit '70c81f606e3f0d781e57d72fa8a1d49331709b70':
  Update to follow internal impl.