Fix MRN-569

Change-Id: Iad373610ebb543db8582e69566678b7e58e0361f