Fixes: 28530428 (cherry picked from commit 7d5da4b0) Change-Id: If2bfc06589adb361f11b89cd5923cb5c255cb680