Merge "Enabling assertions disabled for bug #1074901"