Reported by: binguo
Reviewed by: sunying
Patched by: Jianyuan Li

Change-Id: Ie728ce5185082334e3ce250d73e0660a6097f494