fix for LP 1359906

Change-Id: I3a8e40b25d3ce3a9261cfd999c116d1b6538d84d
Merge "fix for LP 1359906"