Patch by: Wang Zhe
Review by: Andre Fischer
(cherry picked from commit 2de9df3b)

Change-Id: I33b5d9975d52492d296e77b191ae1a394c8443a0