Fixing bug 1302141

Change-Id: I13f77af373d60f86bd9976831fc8eea2f656a4c7
Merge "Fixing bug 1302141"