Resolve Bug:522

Change-Id: I458568c455df451a4a6a50f0fe90317c482d73a6
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Merge "Resolve Bug:522"