Fix for the bug#1369735

Change-Id: Ice79640c35644bf4ccf3301311130ca40570e5e8
Merge "Fix for the bug#1369735" into R1.10