Fix for bug 438.

Change-Id: Id54de5758afa88a9a93167d04c4676175ce5f200
Signed-off-by: kamatchi <kamatchi-l@hcl.com>
Merge "Fix for bug 438." into stable/hydrogen