Resolve MRN-682

Change-Id: I417dabc81381177fffd80cbcadc306e50e79dccb
Merge "Resolve MRN-682"