port dublin patch

Change-Id: I9eac2d30ab5b07f3dd17c0eb5cbf3a1b73ca9308
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-1510
2 files changed