am e7ac37e7: Update to follow internal impl.

* commit 'e7ac37e77ad8605b5e730fe48f088bb77df4b57a':
  Update to follow internal impl.