Found by: berend dot cornelius at germany dot sun dot com
Patch by: Pathangi Janardhanan Jatinshravan <JATINSHR001 at e dot ntu dot edu dot sg>
Review by: Damjan Jovanovic

(cherry picked from commit 519770a2)

Change-Id: I61c9eacd285c8335925f1569b64bb2d600caf545