Patch by: Jianjuan Li
Review by: alg

(cherry picked from commit acd62709)

Change-Id: I1978444641d5f7c053dfae815096e7f2bacce15a