Fix MRN-579

Change-Id: Ic2312f273c088e2835823f57a32ad6bf24cb0a9b
Merge "Fix MRN-579"