additional fix for 1353116

Change-Id: I88670ce7f8cb8b3c41706e193dc0cfca8497064b
Merge "additional fix for 1353116"