bug fix for 1354579

Change-Id: I5b74852943d9eeb5e9835c2e66eead607af59273
Merge "bug fix for 1354579"