tree 81932f59d2dc7af652f3b22d8cde7637c089c477
parent ec0288fdb239856c930648b67c6d43dc32a5612d
author Ying Wang <wangying@google.com> 1458954889 -0700
committer Ying Wang <wangying@google.com> 1458955482 -0700

[DO NOT MERGE] Remove code pulled in by accident.

Remove code pulled in by accident in cherry-pick commit fbc5b9f56.

Change-Id: I4e4a336faf71782c208631c581b2587a5364212f