This patch fixes the bug 1092662

Change-Id: I4cadad38ecd4c3d13b9fa88d96dd373161e7ccbf
Merge "This patch fixes the bug 1092662"