Fix MRN-574

Change-Id: I2f0375dab467782e4d2b711cce17857657b3f01a
Merge "Fix MRN-574"