Merge "Revive Null check for backward compatibility." into mnc-dev