Patch By: hanya
Review By: jsc

(cherry picked from commit 0164d670)

Change-Id: Iad363b75dd30722b10139b31c90b3d598deaaf30