Reviewed by lqi.

Change-Id: Iaafa37a77219edf6c243ebe2d597699d7d80110e