Patch by: Driss Ben Zoubeir <driss.zoubeir@gmail.com>
Review by: arielch@apache.org
(cherry picked from commit b923454a)

Change-Id: Ifef870645491537217bf85b772b130d3bb4a92fd