Merge "Fix incorrect condition in TransformationFaultHandler" am: 7e760f69a7
am: 19bbc1cec0

Change-Id: I330a1b821734b2e3bf9fdbe47b29eb5ba22d7936