tree fa60da1abd64f0993b6ec152277f8c08e4f78f03
parent 2ada0df0345eb2bcb3749fd37a6f1d25d6684b64
author Yi Kong <yikong@google.com> 1510615256 -0800
committer Yi Kong <yikong@google.com> 1510618376 -0800

Revert to r305632

Change-Id: Idce05a34e8e464aec4449d5adf5c2269d1c42ed6