"bug fix for bugs 1355006, 1354579, 1354581, 1354579"
fix for bug 1354579

Change-Id: Iadf2762cde8a85823ce8329471af3e92e55b7c7a
Merge ""bug fix for bugs 1355006, 1354579, 1354581, 1354579" fix for bug 1354579"