Patch by: Wang Zhe
Testing by: Yan Ji
Review by: hdu

(cherry picked from commit 48462123)

Change-Id: I340de4f1b626defa52ecc48938c63ec4d1ce5c1d
Signed-off-by: Tor Lillqvist <tml@iki.fi>