Hotfix for bug 1255928

Change-Id: I987b598c19ca6d2070391ff4590b10ae94df1d9b
Fixes: bug #1255928
Merge "Hotfix for bug 1255928"