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

Change-Id: I4be69ff12a3355b6812afec20e3414dadff3774c