tree f17f7fcb9bf8772bfb0b3005a0bb22af44762f8f
parent 1dbf1d03a93e115c6ac98eae6519ea06cbe50cee
author Yi Kong <yikong@google.com> 1510616209 -0800
committer Yi Kong <yikong@google.com> 1510618518 -0800

Revert to r305632

Change-Id: Ide53cfae09b01ee3c87405a1ecbb7dd065cf885d